Make sure private->monitor_num is a valid monitor number before using it.

2004-07-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_position): Make sure
	private->monitor_num is a valid monitor number before
	using it.  (#139187, Michael Natterer)

2004-06-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid
	a crash if the font doesn't exist.  (#144967, Yevgen Muntyan)

diff --git a/ChangeLog b/ChangeLog
index 71369b76811796cdcfd01e4ccc2e45c7884630aa..58443a4dcec54baeaa765b47e13dfd04fb5112ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_position): Make sure 
+       private->monitor_num is a valid monitor number before 
+       using it.  (#139187, Michael Natterer)
+
 Tue Jul  6 02:00:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooserdefault.c (popup_position_func): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 71369b76811796cdcfd01e4ccc2e45c7884630aa..58443a4dcec54baeaa765b47e13dfd04fb5112ee 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_position): Make sure 
+       private->monitor_num is a valid monitor number before 
+       using it.  (#139187, Michael Natterer)
+
 Tue Jul  6 02:00:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooserdefault.c (popup_position_func): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 71369b76811796cdcfd01e4ccc2e45c7884630aa..58443a4dcec54baeaa765b47e13dfd04fb5112ee 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_position): Make sure 
+       private->monitor_num is a valid monitor number before 
+       using it.  (#139187, Michael Natterer)
+
 Tue Jul  6 02:00:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooserdefault.c (popup_position_func): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 71369b76811796cdcfd01e4ccc2e45c7884630aa..58443a4dcec54baeaa765b47e13dfd04fb5112ee 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_position): Make sure 
+       private->monitor_num is a valid monitor number before 
+       using it.  (#139187, Michael Natterer)
+
 Tue Jul  6 02:00:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooserdefault.c (popup_position_func): 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 0e388120cfd49506bae47f49eb762a55bc320500..a38adbc974425c770125bd4dea766d73794de21e 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3311,6 +3311,9 @@ gtk_menu_position (GtkMenu *menu)
   if (menu->position_func)
     {
       (* menu->position_func) (menu, &x, &y, &push_in, menu->position_func_data);
+      if (private->monitor_num < 0) 
+       private->monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
+
       gdk_screen_get_monitor_geometry (screen, private->monitor_num, &monitor);
     }
   else